squash cleanup:
removed old enmarshal test
fixed missing bracket
un-reordered tests