initial cleanup of existing specs

initial cleanup of existing specs