re-org test for readability
visual tweaks (in progress)