Removing redundant test and improving test names