update changelog, refactor tests