Dcikatic/sol 20 test fixes (WIP)

This branch fixes unit tests on SOL-20 - WIP.