Capture cpus, ram and disk; fix tests