Removed clean-up states from generated tests