Fixing test errors

see #228