Added more edge case specs