tighten up the tests a bit
minor code cleanup and selector renaming