updated vcs, added tests for marker calculation