ticket:1 fixed test makefile and imports