Fixed a few broken tests that were again due to refactoring....