Removed, fixed, and added tests.