more mocks
more test cleanup