fixes some issues with mock tests that have been tripping up Travis and my local testing

#31 is also required