Updated the tests per Konrad's comments