Began adding unit tests