Added additional CPU unit tests plus missing method.