Hb: Refactor tests