Removed unit test related stuff