orz, forgot to fix/modify tests