Unit test fixes
Get rid of hardcoded hash codes as it calculated differently for different frameworks