PR updates, minor naming and formatting issues
Major refactor of test structure and wording. Some method renaming, formatting, cleanup elsewhere.