Fixed tests: building, not passing