tests update
Generator upgrade
Loader fix
NullPointers fix