Use tests from arcusfelis's branch