combines two rspecs, adds new test