Refactored constants
Renamed test mehods
Added more examples