Revise test logic to conform to GWT (given/when/then) model