Started adding unit tests hooray