Fixed several tests, mostly caused by no-assignment issues