Added more methods and tests..