additional spec fixes and helper methods.