Removed duplicated test methods and added new ones.