Added some more boilerplate test cases