Minor tweaks to clean / improve safety of code
Make interface methods public
Basic tests with Robolectric working, one failing