Sprint 2 bug fixes + unit tests