Added unit tests support