Enabled separate tests for Python 2 and 3 and added regen flag