updating tests
fixing after rebase