1 Quick test update

Just a few more readability changes and an update test.