Minor changes
Fixed tests