Fixes for unit tests