clean up various specs, using subject and its more often