updated Builders and removed tests for now