[TASK] Remove unused utility class
[TASK] Switch to new testing strategy