Add infrastructure for unit testing