Remove accidentally copied helper file
Update tests