Fixes some tests