minor changes
fix tests after rebase