Working on fixing up spec tests