Added more unit tests and made sure they were working