Work on making unit tests