Migrated tests to use el.tap()