reworked how the test state is maintained for mstest scenarios, got rid of the hackiness added to the common library.