Restructured test to be algorithm centric