Code cleanup in mocking storm-starter tests