quickly fixes tests so that they will run

- fixed some issues that caused tests not to run
- updated tests that were testing for old conditions
- removed a couple redundant tests

(3:30 am commit :sleepy: :coffee: )