Small changes, added tests/mock as example