moving forward with finishing stage tasks:rainbow:+

- more tests with better coverage
- simplifications and small cleanups