More methods and test cases