ENH: Making tests cleaner and more efficient