generates also Spec2 test and has improved tests