updated CHANGELOG and added test