Add more methods and corresponding tests