Add tests for methods so far