Merge: niunit: fix after/before test calls