Adding unit tests support