Fixed unit-tests. Pick-up from last import