reorganize specs; still some duplicates