Test spec cleanup