Add new tests to CLAMP