Generator update
Tests update
version upgrade