Some additions to test