Addition of CATCH framework for unit testing