Adding automated testing for EAP6.
+ fixing inconsistencies