Fix shitty accidental formatting
Fix borked formatting in test files.
changing items
merging