Improved unit tests usage