Extend unit tests