Adding in more edge case tests