More vspec tests, some output format tweaks and tidying