[TASK] Switch to new testing strategy