Used unit tests to fix up my bugs :)