Restrict more tests