testfix, update makefile for correct test running, add explicitly fixtures into test cases