Auto tests cleanup and enhancements