Reorganized with CodeMaid
SRCMLNET-7 #start-review Added tests to verify the property work.