Merge "Fix style resource completion, and update unit tests"