Add and in upercase
Add test