(#64) - cleanup tests spacing

Plus a simple improvement of cleanup function (use finally)