revert last commit; fixed failing test