Refactoring vmtest
Further refactor of vmtest, utilizing structs to hold the tests and results
fix whitespace from indent conversion