#3314 #226 requesting EIS 0.4 instead of 0.3. Fixed unit tests