updating to latest spec+tests