Fixed the build and added more coverage.