Both of those products are on track for PO's and production in 2H of this year, along with other products, following Beta testing.
This is the latest public update.
Unfortunately you cannot take shortcuts on this comprehensive testing.
But hold on to those shares. When Beta testing approvals are announced, with PO's, the SP will fly.