merge axolotl in a/feature#90; fix tests