Merge "Move unit test mocks to test scoped jar"