tidy and test tweaks