Add remaining unimplemented test cases