Improved unit tests using mockups.