ReAdded tests that were lost