cleanup tests
rm no-longer-necessary special case for tests
Merge branch 'master' of github.com:plicease/Yars