Re-organised specs, added new specs, updated specs.