Added a few more tests and methods