Fixes

- Reference static method using self
- Transition from assert to fail and return