json tests and application controller modification
merge conflict