Modularize the unit tests