Merge "Unit tests for local interface"