Test conforming to recent re-factorings