working on cleanups of spec tests