Update for tests & json