Have ID() deal with blank spaces; add COLOR() macro
Rearrange test assertions to follow order of actual checks