cleanup, now writing set and then tests for simple rpcs