Added a few more tests and functions