Add more methods and tests