Removed unnecessary fixture files and other test tidynesses.