Moved functional test cases to their own file
Fixed more functional tests with multiple args
Fixing tests where JSON keys are in different order