Fixes some tests 2