branch development, changed test.c