Class has been made static. Tests rewritten accordingly. Will break dependant components