Update Helper methods to use options and Fix Tests
Merge branch 'release/v0.5.0'