Added tests for collector and properties for server