Add in test cases