DefaultRouter from/to camel case update, tests update, small bugfixes