Clean up tests
Update CHANGELOG