Add test coverage for ENN
Fix RENN and add test