More testcases work
All tests pass; lots of stuff is no longer const