fix and update tests