cleanup user spec to remove user dataset, use expect syntax, remove assert_invalid assert_valid