Make tests work clean

Clean PR related to PR #217