Fixes some tests that failed for simple reasons