existing tests fix