fixed tests which were broken by @sgade