IN PROGRESS: update tests