Fixed existing tests