fixed
All fixed with tests passing