Add changelog. Fix tests to match new functionality