Added/edited tests.
Merge branch 'master' of github.com:inpho/vsm