Fixed building and test running. Tests are not passing yet