Remove old typed factories and update tests to Builders and classes