Adding more methods and tests
Adding more methods and tests