- Improved clarity of asserts
- Added tests