fix for sdrpt names from Trevor Davies

also update skate tests