Update gems

Fix & Refactor tests