Fixed verifications and renamed test methods