Removed tests, fixed references