Unit tests and minor fixes to validation of ERS properties