Handled nested properties, updated tests