Fixed bug in test-suite