Some little fixes
tests