random cleanup and stubbed a test out