tests fixed up and pretty