initial setup for mocks
Merge branch 'solved'