Add a few more edge cases tests