Added modularity calculation for tests. Changed Output name for Properties. Changed key type in testQueue.