Merge "Revert "add host unit tests""