Started adding unit tests