Added tests for some of the methods, but not fully covering all the code.