Rename some tests to be more self-explanatory and accurate
Minor changes to make tests more consistent in clearing state