Tests fixed, _finalise_unit removed