Modified tests, increased complexity