Push a basic fix - still WIP.
Change the vocab test
Push a basic fix - still WIP.
Merge commit '4398f38' into 3316-amitai