complete rework of testing and gemfile