Merge "Convert tests mk file to bp."