Work on new unit tests