Merge "Enhance fproxy unit tests"