Added controllers - JSON tests pass