Fix index for tests
add mock to requirements
test stubs
Tests
fix merge conflicts