Added more tests
Added extension to match property names