Merge "Move properties handling to the test side"