Fixing manipulation tests #13