syntax fixes and layout changes to spec tests