Cleaning up tests and fixing build failure