Added in a few safety test cases