Clarified some test logic; added whitespace.
Outlined a to-do