Dcikatic/sol 87 unit tests