removed duplicated tests
removed extraneous state transition
replaced instance variables with getter method