#248: change test, remove old code