Added more edge case tests