fix generator
fix thor
add folder for test