Get code to build and unit tests to pass