Merge: nitunit: fix before and after methods