fixing a botched merge
updated test