Added better unit testing configuration