Feature command additions

Making PR so I can see what didn't get committed on a local branch I accidentally made -_-
you are mocking the same two things in each method, probably a good candidate to swap into the setUp/tearDown methods