Fixed some things and started working on unit tests