rewrite tests with expect syntax instead of should