Cleaned up tests (More repairs still needed).