Updated to 'enterprise' version (more reliable, but much larger) and added some tests.