Mocha tests for json > bson > json

Also reverted some changes to router & tweaked dataTransform