Modifications to input.rb and testparse.rb