Added tests for new features of wildcard expansion