Adding more methods and tests