Adding new testing properties plus some UI cleanup