fixup:w
adding unittests to test validation