Removed mapping and prepared for defaults
Fixed frontcontroller tests to prepare for defaults
Fixed mocks to prepare for path defaults