Testing framework refactoring and move, new tests.mk