Update testing code, fix #33, again.