Moving previous unit and integration tests to test-make