Added new tests and reconfigured for 32bit