update tests & formatting