Spec cleanup

Tests run and produce coverage