Cleaning, simplifying, fixing tests