Require mock, for the tests
Update authors (Erik-Jan left)
Refactor tests so that they work offline and have one test per test function