added additional tests from common ( btw FUC)