Fix test errors

Continue of #4