fix for measures
adding measure tests
fix some tests