Updated gems and added dependencies
Updated test helper.
Adding code and tests.