Expand the tests