Changed tests to fix them