#268 introduction of qualifier and unit test