Removed hardcoded strings
Throwing exception to fill expectations