Fix / update unit tests