Some cleanups
Increase timeout to 10 seconds
Bumped version number to 2.3.2