Merge branch 'ticket25183_029_01' into ticket24902_029_05

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test.c
Simple merge

diff --cc src/test/test.h
Simple merge