Changes to build structure
Unset testing FORCE32 flag