Start of performance function implementation, re-organize test system architecture