just some more test cleanup
Merge branch 'dev' of github.com:pculture/unisubs into dev
Merge branch 'dev' of github.com:pculture/unisubs into dev