ET-1302 : More tests and minor fixes