remove unused and update tests