bug in test after merge