Update Helper methods to use options and Fix Tests