Changes to get tests working. All tests enabled again