Fixed tests clean-up