minor cleanup. added top-level array test that is commented out untill it can pass