Unit tests complete and working