Added new customization options. Fixed tests.