Started a refactor on handling arguments
Fixed initialize tests after refactoring
All tests now passing after reorg