fixed small confusion
tests now run (but not all of them pass)
more test fixing
more test fixing, but still not all of them pass