Added some tests to test the additional functionality added in the last commit