Added test runner
Fixed code that broke during testing
Removed lots of dead code from vcp
Fixed broken tests and added tests for extra coverage