Updated CHANGELOG and changes to tests
2 files changed