Fix #952 (tests are broken now)
Fix tests