Jgarcia/merge unit tests