Fixed unittests to include original, proper, test case.