Fix gem dependencies
Fix test case names to match requirements