Add some more tests, add -> instance to API