Unit tests all passing now