Add tests for various methods