(cherry picked from commit 6a1cb25c99)
6a1cb25c99
(cherry picked from commit a5b8085113)
a5b8085113
Fix a bunch of things mentioned in the review. Delete commented code from module. Add fix for vcsim not returning uncommitted. Add integration test. Add changes suggested