Fixing bugs and Buildable Tests