Fixes for tests