Fixes
Fixed tests