[fix] compiles again. TODO: unit_test fixes
Unit test- repaired