ticket:1 test, fixtures and Makefile added