Fixed up tests to work with MSR
Tests are passing.