- Added missing location to throw statement
- Fixed test