Extend unit-tests