V1.0 - merged mvbms-test to main - made the changes needed for the project to compile