Fix all existing tests