cleaned up some failing tests
Merge branch 'testing_updates'