Added test cases to up code coverage and such