Work on getting unit tests passing