More stuff, add tests