Task/test and fixes

Fixed in fe8920630432986636c339340155a24d752ac1e0