Moving the stub to the test
Simplifying tests