Updates to add option to reorder parameters
Fix tests
Updates to fix test and fix some strange tabbings
Clean methods