update gems
merge gem updates
add to get basic tests to pass