Test fixups
Added back in model type discovery
Minor cosmetic changes
Removed unused code
First attempt at bringing VB support back in
VB support now working again