Wrote unit tests for the extensions
Fixed extensions code
Applied new extensions code to builders