Finally makes dem tests pass