Fix failing test & remove tapp & add notify