test update

last time we got crazy merge issues - taking it slow this time