Wrote some more methods and tests