remove some unused test code and fix some spec typos