Cleanup of unit-tests