Removed old test and added new. Updated files