More tests cleaned, through master now.