Updating to fix broken unit tests
Adding in dynamic version support to global