add more specs; refactor main specs slightly