Fixed Build, and added a test that fails