Add tests for new methods