Adding more methods and a test