All tests pass now. Also fixed a consistancy