czaheri & sk32444 added unit tests