Further simplification of EasyTest