wordsets refactored + auth tests added