Fixing VPC unit test to use Spring