Move and fix default spec