Extend unit testing