Cleanup Spec format, and add failing test for #307