Add improvements and new tests to CA