Since you raise TestFail if test failed, cleanup won't be executed, so I suggest to add ```try....finally``` and move cleanup to finally part. What do you think?