6494 tests (@wip)