Added a couple more test methods/steps