:ultimate fix in brick adapter + test fix