Began the process of adding unit tests