renamed test file, cleaned up some naming