Updated simple.json to new format
More updating of fixtures
More tidying