Few more clean-up items related to tests