Fixing merge conflict
Writing up some tests for input_helpers