Seperated test methods and changed names of methods