Lots of style clean ups, consistency, etc

Change-Id: I982974ea28aa5865a960f2e633c1bc414d33247f
Updates to the style used in the tests

Make sure we use the appropriate types, prefer using individual symbols
instead of the entire namespace.

Change-Id: I0736ffb0c99bcb730549b3c85dd1409a68dd92f9
Merge branch 'minor-cleanups'

Change-Id: Id407f647a701bf9249723ca9cff04a9fd8fc5e20