2368: fixed tests
Merge branch 'staging' of github.com:pculture/unisubs into staging