fix all falling tests

related to #21