Updated test properties and fixed typo
Fixing merge conflict