Fix the issues caused by commas in the property list and preceding @include block. Add some more unit tests to verify the fixes.