#420 Converted to phpunit test with dataproviders