Add new tests, make existing tests more difficult