Feature/fix broken unit tests

/to @rmg