rename make targets
moved tests to fixtures
removed terst
removed semicolons