test improvements
delete mocks