unify test code for 2005/06-2009/10