More test specs and some clean up.