Removed tests from previous fix