Add tests. Add some convenience methods