Huge deploy error FIX, tests updated