Added more test cases

None of the tests are working yet