jc: added enumeration, started tests
jc: added enumeration, started tests