Added a method, added a few test cases