simplifying test methods and removing unnecessary code