Fix issue w/ virtual base module & finish tests