Finished main refactor for WFS Utilities. All lettuce tests were running