new design, tests - green
greener tests :-)