renamed tests, added new ones