Task/test and fixes

Fixed in aacdd406dee85af8efec515e67c9caf73c799284