Better mocks

Start accordion testing