Revise #52: Add testing code