changed all tests to use MakeSure instead of assert