try to group these (eg put the test packages on same line)