Removed old testing stuff
camelCase to under_score