cleaned up more specs, added helper files