diff --git a/compiler/globals.py b/compiler/globals.py
index 991ec1ad..3bdc5f92 100644
--- a/compiler/globals.py
+++ b/compiler/globals.py
@@ -116,6 +116,11 @@ def init_openram(config_file, is_unit_test=True):
 
     import_tech()
 
+    init_paths()
+
+    # This depends on the tech, so do it after tech is loaded
+    init_config()
+
     # Reset the static duplicate name checker for unit tests.
     import hierarchy_design
     hierarchy_design.hierarchy_design.name_map=[]
@@ -229,15 +234,6 @@ def read_config(config_file, is_unit_test=True):
                                                                                OPTS.num_r_ports,
                                                                                OPTS.tech_name)
         
-    # Don't delete the output dir, it may have other files!
-    # make the directory if it doesn't exist
-    try:
-        os.makedirs(OPTS.output_path, 0o750)
-    except OSError as e:
-        if e.errno == 17:  # errno.EEXIST
-            os.chmod(OPTS.output_path, 0o750)
-    except:
-        debug.error("Unable to make output directory.",-1)
 
         
 def end_openram():
@@ -299,12 +295,6 @@ def setup_paths():
 
     cleanup_paths()
 
-    # make the directory if it doesn't exist
-    try:
-        os.makedirs(OPTS.openram_temp, 0o750)
-    except OSError as e:
-        if e.errno == 17:  # errno.EEXIST
-            os.chmod(OPTS.openram_temp, 0o750)
 
 
 def is_exe(fpath):
@@ -320,7 +310,37 @@ def find_exe(check_exe):
         if is_exe(exe):
             return exe
     return None
-        
+
+def init_paths():
+    """ Create the temp and output directory if it doesn't exist """
+
+    # make the directory if it doesn't exist
+    try:
+        os.makedirs(OPTS.openram_temp, 0o750)
+    except OSError as e:
+        if e.errno == 17:  # errno.EEXIST
+            os.chmod(OPTS.openram_temp, 0o750)
+    
+    # Don't delete the output dir, it may have other files!
+    # make the directory if it doesn't exist
+    try:
+        os.makedirs(OPTS.output_path, 0o750)
+    except OSError as e:
+        if e.errno == 17:  # errno.EEXIST
+            os.chmod(OPTS.output_path, 0o750)
+    except:
+        debug.error("Unable to make output directory.",-1)
+            
+def init_config():
+    """ Initialize the SRAM configurations. """
+    # Create the SRAM configuration
+    from sram_config import sram_config
+    OPTS.sram_config = sram_config(OPTS.word_size,
+                                   OPTS.num_words,
+                                   OPTS.num_banks)
+
+                                   
+    
 # imports correct technology directories for testing
 def import_tech():
     global OPTS
diff --git a/compiler/modules/bank.py b/compiler/modules/bank.py
index f39fb424..3af935a3 100644
--- a/compiler/modules/bank.py
+++ b/compiler/modules/bank.py
@@ -29,6 +29,10 @@ class bank(design.design):
         design.design.__init__(self, name)
         debug.info(2, "create sram of size {0} with {1} words".format(self.word_size,self.num_words))
 
+
+        self.total_write = OPTS.num_rw_ports + OPTS.num_w_ports
+        self.total_read = OPTS.num_rw_ports + OPTS.num_r_ports
+        self.total_ports = OPTS.num_rw_ports + OPTS.num_w_ports + OPTS.num_r_ports
         
         # The local control signals are gated when we have bank select logic,
         # so this prefix will be added to all of the input signals to create
diff --git a/compiler/modules/hierarchical_decoder.py b/compiler/modules/hierarchical_decoder.py
index 38136b62..7c90b1f1 100644
--- a/compiler/modules/hierarchical_decoder.py
+++ b/compiler/modules/hierarchical_decoder.py
@@ -130,7 +130,7 @@ class hierarchical_decoder(design.design):
             self.total_number_of_predecoder_outputs = 4*self.no_of_pre2x4 + 8*self.no_of_pre3x8
         else:
             self.total_number_of_predecoder_outputs = 0            
-            debug.error("Not enough rows for a hierarchical decoder. Non-hierarchical not supported yet.",-1)
+            debug.error("Not enough rows ({}) for a hierarchical decoder. Non-hierarchical not supported yet.".format(self.num_inputs),-1)
 
         # Calculates height and width of pre-decoder,
         if self.no_of_pre3x8 > 0:
diff --git a/compiler/openram.py b/compiler/openram.py
index a6db154d..e4ab593e 100755
--- a/compiler/openram.py
+++ b/compiler/openram.py
@@ -52,14 +52,13 @@ print(*output_files,sep="\n")
 start_time = datetime.datetime.now()
 print_time("Start",start_time)
 
+# Configure the SRAM organization
 c = sram_config(word_size=OPTS.word_size,
-                num_words=OPTS.num_words,
-                num_rw_ports=OPTS.num_rw_ports,
-                num_w_ports=OPTS.num_w_ports,
-                num_r_ports=OPTS.num_r_ports)
+                num_words=OPTS.num_words)
 
 # import SRAM test generation
-s = sram(c, OPTS.output_name)
+s = sram(sram_config=c,
+         name=OPTS.output_name)
 
 # Output the files for the resulting SRAM
 s.save()
diff --git a/compiler/options.py b/compiler/options.py
index a81f7fae..5298c00f 100644
--- a/compiler/options.py
+++ b/compiler/options.py
@@ -55,11 +55,17 @@ class options(optparse.Values):
     num_rw_ports = 1
     num_r_ports = 0
     num_w_ports = 0
+    
     # These will get initialized by the the file
     supply_voltages = ""
     temperatures = ""
     process_corners = ""
-    
+
+    # These are the main configuration parameters that should be over-ridden
+    # in a configuration file.
+    #num_words = 0
+    #num_banks = 1
+    #word_size = 0
 
     # These are the default modules that can be over-riden
     decoder = "hierarchical_decoder"
diff --git a/compiler/pgates/pbitcell.py b/compiler/pgates/pbitcell.py
index 0b2ec27d..3ac0fa74 100644
--- a/compiler/pgates/pbitcell.py
+++ b/compiler/pgates/pbitcell.py
@@ -16,18 +16,18 @@ class pbitcell(pgate.pgate):
     width = None
     height = None
     
-    def __init__(self, num_rw_ports=OPTS.num_rw_ports, num_w_ports=OPTS.num_w_ports, num_r_ports=OPTS.num_r_ports):
+    def __init__(self):
         
-        name = "pbitcell_{0}RW_{1}W_{2}R".format(num_rw_ports, num_w_ports, num_r_ports)
+        self.num_rw_ports = OPTS.num_rw_ports
+        self.num_w_ports = OPTS.num_w_ports
+        self.num_r_ports = OPTS.num_r_ports
+        
+        name = "pbitcell_{0}RW_{1}W_{2}R".format(self.num_rw_ports, self.num_w_ports, self.num_r_ports)
         pgate.pgate.__init__(self, name)
-        debug.info(2, "create a multi-port bitcell with {0} rw ports, {1} w ports and {2} r ports".format(num_rw_ports,
-                                                                                                          num_w_ports,
-                                                                                                          num_r_ports))  
+        debug.info(2, "create a multi-port bitcell with {0} rw ports, {1} w ports and {2} r ports".format(self.num_rw_ports,
+                                                                                                          self.num_w_ports,
+                                                                                                          self.num_r_ports))  
 
-        self.num_rw_ports = num_rw_ports
-        self.num_w_ports = num_w_ports
-        self.num_r_ports = num_r_ports
-        
         self.create_netlist()
         if not OPTS.netlist_only:
             self.create_layout()
diff --git a/compiler/sram.py b/compiler/sram.py
index 3891150b..0feea1b3 100644
--- a/compiler/sram.py
+++ b/compiler/sram.py
@@ -12,8 +12,9 @@ class sram():
     results.
     We can later add visualizer and other high-level functions as needed.
     """
-    def __init__(self, sram_config, name="sram"):
+    def __init__(self, sram_config, name):
 
+        sram_config.compute_sizes()
         sram_config.set_local_config(self)
         
         # reset the static duplicate name checker for unit tests
@@ -27,6 +28,8 @@ class sram():
         start_time = datetime.datetime.now()
 
         self.name = name
+
+        
         if self.num_banks == 1:
             from sram_1bank import sram_1bank as sram
         elif self.num_banks == 2:
@@ -35,8 +38,8 @@ class sram():
             from sram_4bank import sram_4bank as sram
         else:
             debug.error("Invalid number of banks.",-1)
-            
-        self.s = sram(sram_config, name)                        
+
+        self.s = sram(name, sram_config)  
         self.s.create_netlist()
         if not OPTS.netlist_only:
             self.s.create_layout()
diff --git a/compiler/sram_1bank.py b/compiler/sram_1bank.py
index 20dab3c7..e27eb2b3 100644
--- a/compiler/sram_1bank.py
+++ b/compiler/sram_1bank.py
@@ -18,12 +18,11 @@ class sram_1bank(sram_base):
     """
     Procedures specific to a one bank SRAM.
     """
-    def __init__(self, sram_config, name):
-        sram_base.__init__(self, sram_config, name)
+    def __init__(self, name, sram_config):
+        sram_base.__init__(self, name, sram_config)
         
 
     def create_netlist(self):
-        self.compute_sizes()
         sram_base.create_netlist(self)
         self.create_modules()
 
diff --git a/compiler/sram_2bank.py b/compiler/sram_2bank.py
index ff0d7868..daf02563 100644
--- a/compiler/sram_2bank.py
+++ b/compiler/sram_2bank.py
@@ -16,8 +16,8 @@ class sram_2bank(sram_base):
     """
     Procedures specific to a two bank SRAM.
     """
-    def __init__(self, sram_config, name):
-        sram_base.__init__(self, sram_config, name)
+    def __init__(self, name, sram_config):
+        sram_base.__init__(self, name, sram_config)
 
     def compute_bank_offsets(self):
         """ Compute the overall offsets for a two bank SRAM """
diff --git a/compiler/sram_4bank.py b/compiler/sram_4bank.py
index 64163e9f..44b8ba87 100644
--- a/compiler/sram_4bank.py
+++ b/compiler/sram_4bank.py
@@ -16,8 +16,8 @@ class sram_4bank(sram_base):
     """
     Procedures specific to a four bank SRAM.
     """
-    def __init__(self, sram_config, name):
-        sram_base.__init__(self, sram_config, name)
+    def __init__(self, name, sram_config):
+        sram_base.__init__(self, name, sram_config)
 
     def compute_bank_offsets(self):
         """ Compute the overall offsets for a four bank SRAM """
diff --git a/compiler/sram_base.py b/compiler/sram_base.py
index 7ead2e48..af21d704 100644
--- a/compiler/sram_base.py
+++ b/compiler/sram_base.py
@@ -3,7 +3,6 @@ import datetime
 import getpass
 import debug
 from importlib import reload
-from math import log,sqrt,ceil
 from vector import vector
 from globals import OPTS, print_time
 
@@ -14,85 +13,14 @@ class sram_base(design):
     Dynamically generated SRAM by connecting banks to control logic. The
     number of banks should be 1 , 2 or 4
     """
-    def __init__(self, sram_config, name):
+    def __init__(self, name, sram_config):
         design.__init__(self, name)
-
-        # This is used to compute the sizes of the SRAM
-        # and must be loaded before netlist creation
-        c = reload(__import__(OPTS.bitcell))
-        self.mod_bitcell = getattr(c, OPTS.bitcell)
-        self.bitcell = self.mod_bitcell()
-
-        self.sram_config = sram_config
-        self.sram_config.set_local_config(self)
         
+        self.sram_config = sram_config
+        sram_config.set_local_config(self)
+
         self.bank_insts = []
 
-    def compute_sizes(self):
-        """  Computes the organization of the memory using bitcell size by trying to make it square."""
-
-        debug.check(self.num_banks in [1,2,4], "Valid number of banks are 1 , 2 and 4.")
-
-        self.num_words_per_bank = self.num_words/self.num_banks
-        self.num_bits_per_bank = self.word_size*self.num_words_per_bank
-        
-        # If this was hard coded, don't dynamically compute it!
-        if self.sram_config.words_per_row:
-            self.words_per_row = self.sram_config.words_per_row
-        else:
-            # Compute the area of the bitcells and estimate a square bank (excluding auxiliary circuitry)
-            self.bank_area = self.bitcell.width*self.bitcell.height*self.num_bits_per_bank
-            self.bank_side_length = sqrt(self.bank_area)
-
-            # Estimate the words per row given the height of the bitcell and the square side length
-            self.tentative_num_cols = int(self.bank_side_length/self.bitcell.width)
-            self.words_per_row = self.estimate_words_per_row(self.tentative_num_cols, self.word_size)
-
-            # Estimate the number of rows given the tentative words per row
-            self.tentative_num_rows = self.num_bits_per_bank / (self.words_per_row*self.word_size)
-            self.words_per_row = self.amend_words_per_row(self.tentative_num_rows, self.words_per_row)
-        
-        # Fix the number of columns and rows
-        self.num_cols = int(self.words_per_row*self.word_size)
-        self.num_rows = int(self.num_words_per_bank/self.words_per_row)
-
-        # Compute the address and bank sizes
-        self.row_addr_size = int(log(self.num_rows, 2))
-        self.col_addr_size = int(log(self.words_per_row, 2))
-        self.bank_addr_size = self.col_addr_size + self.row_addr_size
-        self.addr_size = self.bank_addr_size + int(log(self.num_banks, 2))
-
-        self.sram_config.words_per_row = self.words_per_row
-        debug.info(1,"Words per row: {}".format(self.words_per_row))
-
-    def estimate_words_per_row(self,tentative_num_cols, word_size):
-        """
-        This provides a heuristic rounded estimate for the number of words
-        per row.
-        """
-
-        if tentative_num_cols < 1.5*word_size:
-            return 1
-        elif tentative_num_cols > 3*word_size:
-            return 4
-        else:
-            return 2
-
-    def amend_words_per_row(self,tentative_num_rows, words_per_row):
-        """
-        This picks the number of words per row more accurately by limiting
-        it to a minimum and maximum.
-        """
-        # Recompute the words per row given a hard max
-        if(tentative_num_rows > 512):
-            debug.check(tentative_num_rows*words_per_row <= 2048, "Number of words exceeds 2048")
-            return int(words_per_row*tentative_num_rows/512)
-        # Recompute the words per row given a hard min
-        if(tentative_num_rows < 16):
-            debug.check(tentative_num_rows*words_per_row >= 16, "Minimum number of rows is 16, but given {0}".format(tentative_num_rows))
-            return int(words_per_row*tentative_num_rows/16)
-            
-        return words_per_row
 
     def add_pins(self):
         """ Add pins for entire SRAM. """
@@ -270,6 +198,9 @@ class sram_base(design):
 
     def add_modules(self):
         """ Create all the modules that will be used """
+        c = reload(__import__(OPTS.bitcell))
+        self.mod_bitcell = getattr(c, OPTS.bitcell)
+        self.bitcell = self.mod_bitcell()
         
         c = reload(__import__(OPTS.control_logic))
         self.mod_control_logic = getattr(c, OPTS.control_logic)
diff --git a/compiler/sram_config.py b/compiler/sram_config.py
index e7c58905..e7c80fd8 100644
--- a/compiler/sram_config.py
+++ b/compiler/sram_config.py
@@ -1,36 +1,96 @@
+import debug
+from math import log,sqrt,ceil
+from importlib import reload
 from globals import OPTS
 
 class sram_config:
     """ This is a structure that is used to hold the SRAM configuration options. """
     
-    def __init__(self, word_size, num_words, num_banks=1, num_rw_ports=OPTS.num_rw_ports, num_w_ports=OPTS.num_w_ports, num_r_ports=OPTS.num_r_ports):
+    def __init__(self, word_size, num_words, num_banks=1):
         self.word_size = word_size
         self.num_words = num_words
         self.num_banks = num_banks
-        self.num_rw_ports = num_rw_ports
-        self.num_w_ports = num_w_ports
-        self.num_r_ports = num_r_ports
 
         # This will get over-written when we determine the organization
-        self.num_banks = 1
         self.words_per_row = None
-        
-        self.total_write = num_rw_ports + num_w_ports
-        self.total_read = num_rw_ports + num_r_ports
-        self.total_ports = num_rw_ports + num_w_ports + num_r_ports
 
+        # Move the module names to this?
+        
 
     def set_local_config(self, module):
-        module.word_size = self.word_size
-        module.num_words = self.num_words
-        module.num_banks = self.num_banks
-        module.num_rw_ports = self.num_rw_ports
-        module.num_w_ports = self.num_w_ports
-        module.num_r_ports = self.num_r_ports
+        """ Copy all of the member variables to the given module for convenience """
         
-        module.words_per_row = self.words_per_row
-        
-        module.total_write = self.total_write
-        module.total_read = self.total_read
-        module.total_ports = self.total_ports
+        members = [attr for attr in dir(self) if not callable(getattr(self, attr)) and not attr.startswith("__")]
 
+        # Copy all the variables to the local module
+        for member in members:
+            setattr(module,member,getattr(self,member))
+
+    def compute_sizes(self):
+        """  Computes the organization of the memory using bitcell size by trying to make it square."""
+
+        c = reload(__import__(OPTS.bitcell))
+        self.mod_bitcell = getattr(c, OPTS.bitcell)
+        # pass a copy of myself for the port numbers
+        self.bitcell = self.mod_bitcell()
+        
+        
+        debug.check(self.num_banks in [1,2,4], "Valid number of banks are 1 , 2 and 4.")
+
+        self.num_words_per_bank = self.num_words/self.num_banks
+        self.num_bits_per_bank = self.word_size*self.num_words_per_bank
+        
+        # If this was hard coded, don't dynamically compute it!
+        if not self.words_per_row:
+            # Compute the area of the bitcells and estimate a square bank (excluding auxiliary circuitry)
+            self.bank_area = self.bitcell.width*self.bitcell.height*self.num_bits_per_bank
+            self.bank_side_length = sqrt(self.bank_area)
+
+            # Estimate the words per row given the height of the bitcell and the square side length
+            self.tentative_num_cols = int(self.bank_side_length/self.bitcell.width)
+            self.words_per_row = self.estimate_words_per_row(self.tentative_num_cols, self.word_size)
+
+            # Estimate the number of rows given the tentative words per row
+            self.tentative_num_rows = self.num_bits_per_bank / (self.words_per_row*self.word_size)
+            self.words_per_row = self.amend_words_per_row(self.tentative_num_rows, self.words_per_row)
+        
+        # Fix the number of columns and rows
+        self.num_cols = int(self.words_per_row*self.word_size)
+        self.num_rows = int(self.num_words_per_bank/self.words_per_row)
+
+        # Compute the address and bank sizes
+        self.row_addr_size = int(log(self.num_rows, 2))
+        self.col_addr_size = int(log(self.words_per_row, 2))
+        self.bank_addr_size = self.col_addr_size + self.row_addr_size
+        self.addr_size = self.bank_addr_size + int(log(self.num_banks, 2))
+
+        debug.info(1,"Words per row: {}".format(self.words_per_row))
+
+    def estimate_words_per_row(self,tentative_num_cols, word_size):
+        """
+        This provides a heuristic rounded estimate for the number of words
+        per row.
+        """
+
+        if tentative_num_cols < 1.5*word_size:
+            return 1
+        elif tentative_num_cols > 3*word_size:
+            return 4
+        else:
+            return 2
+
+    def amend_words_per_row(self,tentative_num_rows, words_per_row):
+        """
+        This picks the number of words per row more accurately by limiting
+        it to a minimum and maximum.
+        """
+        # Recompute the words per row given a hard max
+        if(not OPTS.is_unit_test and tentative_num_rows > 512):
+            debug.check(tentative_num_rows*words_per_row <= 2048, "Number of words exceeds 2048")
+            return int(words_per_row*tentative_num_rows/512)
+        # Recompute the words per row given a hard min
+        if(not OPTS.is_unit_test and tentative_num_rows < 16):
+            debug.check(tentative_num_rows*words_per_row >= 16, "Minimum number of rows is 16, but given {0}".format(tentative_num_rows))
+            return int(words_per_row*tentative_num_rows/16)
+            
+        return words_per_row
diff --git a/compiler/tests/04_pbitcell_test.py b/compiler/tests/04_pbitcell_test.py
index 070637f9..70f51a99 100755
--- a/compiler/tests/04_pbitcell_test.py
+++ b/compiler/tests/04_pbitcell_test.py
@@ -18,47 +18,76 @@ class pbitcell_test(openram_test):
 
     def runTest(self):
         globals.init_openram("config_20_{0}".format(OPTS.tech_name))
-        import pbitcell
+        from pbitcell import pbitcell
         import tech
-
+        OPTS.sram_config.num_rw_ports=1
+        OPTS.sram_config.num_w_ports=1
+        OPTS.sram_config.num_r_ports=1
         debug.info(2, "Bitcell with 1 of each port: read/write, write, and read")
-        tx = pbitcell.pbitcell(num_rw_ports=1,num_w_ports=1,num_r_ports=1)
+        tx = pbitcell()
         self.local_check(tx)
         
+        OPTS.sram_config.num_rw_ports=0
+        OPTS.sram_config.num_w_ports=1
+        OPTS.sram_config.num_r_ports=1
         debug.info(2, "Bitcell with 0 read/write ports")
-        tx = pbitcell.pbitcell(num_rw_ports=0,num_w_ports=1,num_r_ports=1)
+        tx = pbitcell()
         self.local_check(tx)
         
+        OPTS.sram_config.num_rw_ports=1
+        OPTS.sram_config.num_w_ports=0
+        OPTS.sram_config.num_r_ports=1
         debug.info(2, "Bitcell with 0 write ports")
-        tx = pbitcell.pbitcell(num_rw_ports=1,num_w_ports=0,num_r_ports=1)
+        tx = pbitcell()
         self.local_check(tx)
         
+        OPTS.sram_config.num_rw_ports=1
+        OPTS.sram_config.num_w_ports=1
+        OPTS.sram_config.num_r_ports=0
         debug.info(2, "Bitcell with 0 read ports")
-        tx = pbitcell.pbitcell(num_rw_ports=1,num_w_ports=1,num_r_ports=0)
+        tx = pbitcell()
         self.local_check(tx)
         
+        OPTS.sram_config.num_rw_ports=1
+        OPTS.sram_config.num_w_ports=0
+        OPTS.sram_config.num_r_ports=0
         debug.info(2, "Bitcell with 0 read ports and 0 write ports")
-        tx = pbitcell.pbitcell(num_rw_ports=1,num_w_ports=0,num_r_ports=0)
+        tx = pbitcell()
         self.local_check(tx)
 
+        OPTS.sram_config.num_rw_ports=2
+        OPTS.sram_config.num_w_ports=2
+        OPTS.sram_config.num_r_ports=2
         debug.info(2, "Bitcell with 2 of each port: read/write, write, and read")
-        tx = pbitcell.pbitcell(num_rw_ports=2,num_w_ports=2,num_r_ports=2)
+        tx = pbitcell()
         self.local_check(tx)
         
+        OPTS.sram_config.num_rw_ports=0
+        OPTS.sram_config.num_w_ports=2
+        OPTS.sram_config.num_r_ports=2
         debug.info(2, "Bitcell with 0 read/write ports")
-        tx = pbitcell.pbitcell(num_rw_ports=0,num_w_ports=2,num_r_ports=2)
+        tx = pbitcell()
         self.local_check(tx)
         
+        OPTS.sram_config.num_rw_ports=2
+        OPTS.sram_config.num_w_ports=0
+        OPTS.sram_config.num_r_ports=2
         debug.info(2, "Bitcell with 0 write ports")
-        tx = pbitcell.pbitcell(num_rw_ports=2,num_w_ports=0,num_r_ports=2)
+        tx = pbitcell()
         self.local_check(tx)
         
+        OPTS.sram_config.num_rw_ports=2
+        OPTS.sram_config.num_w_ports=2
+        OPTS.sram_config.num_r_ports=0
         debug.info(2, "Bitcell with 0 read ports")
-        tx = pbitcell.pbitcell(num_rw_ports=2,num_w_ports=2,num_r_ports=0)
+        tx = pbitcell()
         self.local_check(tx)
         
+        OPTS.sram_config.num_rw_ports=2
+        OPTS.sram_config.num_w_ports=0
+        OPTS.sram_config.num_r_ports=0
         debug.info(2, "Bitcell with 0 read ports and 0 write ports")
-        tx = pbitcell.pbitcell(num_rw_ports=2,num_w_ports=0,num_r_ports=0)
+        tx = pbitcell()
         self.local_check(tx)
 
         globals.end_openram()
diff --git a/compiler/tests/19_psingle_bank_test.py b/compiler/tests/19_psingle_bank_test.py
index b98c2ff1..fd68409a 100755
--- a/compiler/tests/19_psingle_bank_test.py
+++ b/compiler/tests/19_psingle_bank_test.py
@@ -29,7 +29,6 @@ class psingle_bank_test(openram_test):
         OPTS.num_r_ports = 1
         c = sram_config(word_size=4,
                         num_words=16)
-        
         c.words_per_row=1
         debug.info(1, "No column mux")
         name = "bank1_{0}rw_{1}w_{2}r_single".format(c.num_rw_ports, c.num_w_ports, c.num_r_ports)
diff --git a/compiler/tests/20_sram_1bank_test.py b/compiler/tests/20_sram_1bank_test.py
index ad5732a6..ce482b6d 100755
--- a/compiler/tests/20_sram_1bank_test.py
+++ b/compiler/tests/20_sram_1bank_test.py
@@ -21,27 +21,28 @@ class sram_1bank_test(openram_test):
                         num_words=16,
                         num_banks=1)
         
+        c.words_per_row=1
         debug.info(1, "Single bank, no column mux with control logic")
-        a = sram(c, name="sram1")
+        a = sram(c, "sram1")
         self.local_check(a, final_verification=True)
 
         c.num_words=32
         c.words_per_row=2
         debug.info(1, "Single bank two way column mux with control logic")
-        a = sram(c, name="sram2")
+        a = sram(c, "sram2")
         self.local_check(a, final_verification=True)
 
         c.num_words=64
         c.words_per_row=4
         debug.info(1, "Single bank, four way column mux with control logic")
-        a = sram(c, name="sram3")
+        a = sram(c, "sram3")
         self.local_check(a, final_verification=True)
 
         c.word_size=2
         c.num_words=128
         c.words_per_row=8
         debug.info(1, "Single bank, eight way column mux with control logic")
-        a = sram(c, name="sram4")
+        a = sram(c, "sram4")
         self.local_check(a, final_verification=True)
 
         globals.end_openram()
diff --git a/compiler/tests/20_sram_2bank_test.py b/compiler/tests/20_sram_2bank_test.py
index fd701860..ff9fbaea 100755
--- a/compiler/tests/20_sram_2bank_test.py
+++ b/compiler/tests/20_sram_2bank_test.py
@@ -22,27 +22,28 @@ class sram_2bank_test(openram_test):
                         num_words=32,
                         num_banks=2)
 
+        c.words_per_row=1
         debug.info(1, "Two bank, no column mux with control logic")
-        a = sram(c, name="sram1")
+        a = sram(c, "sram1")
         self.local_check(a, final_verification=True)
 
         c.num_words=64
         c.words_per_row=2
         debug.info(1, "Two bank two way column mux with control logic")
-        a = sram(c, name="sram2")
+        a = sram(c, "sram2")
         self.local_check(a, final_verification=True)
 
         c.num_words=128
         c.words_per_row=4
         debug.info(1, "Two bank, four way column mux with control logic")
-        a = sram(c, name="sram3")
+        a = sram(c, "sram3")
         self.local_check(a, final_verification=True)
 
         c.word_size=2
         c.num_words=256
         c.words_per_row=8
         debug.info(1, "Two bank, eight way column mux with control logic")
-        a = sram(c, name="sram4")
+        a = sram(c, "sram4")
         self.local_check(a, final_verification=True)
 
         globals.end_openram()
diff --git a/compiler/tests/20_sram_4bank_test.py b/compiler/tests/20_sram_4bank_test.py
index 19937d04..fb34d3b0 100755
--- a/compiler/tests/20_sram_4bank_test.py
+++ b/compiler/tests/20_sram_4bank_test.py
@@ -23,26 +23,26 @@ class sram_4bank_test(openram_test):
                         num_banks=4)
 
         debug.info(1, "Four bank, no column mux with control logic")
-        a = sram(c, name="sram1")
+        a = sram(c, "sram1")
         self.local_check(a, final_verification=True)
 
         c.num_words=128
         c.words_per_row=2
         debug.info(1, "Four bank two way column mux with control logic")
-        a = sram(c, name="sram2")
+        a = sram(c, "sram2")
         self.local_check(a, final_verification=True)
 
         c.num_words=256
         c.words_per_row=4
         debug.info(1, "Four bank, four way column mux with control logic")
-        a = sram(word_size=16, num_words=256, num_banks=4, name="sram3")
+        a = sram(c, "sram3")
         self.local_check(a, final_verification=True)
 
         c.word_size=2
         c.num_words=256
         c.words_per_row=8
         debug.info(1, "Four bank, eight way column mux with control logic")
-        a = sram.sram(word_size=2, num_words=256, num_banks=4, name="sram4")
+        a = sram.sram(c, "sram4")
         self.local_check(a, final_verification=True)
 
         globals.end_openram()
diff --git a/compiler/tests/21_hspice_delay_test.py b/compiler/tests/21_hspice_delay_test.py
index cfcf3173..93fc8413 100755
--- a/compiler/tests/21_hspice_delay_test.py
+++ b/compiler/tests/21_hspice_delay_test.py
@@ -32,7 +32,7 @@ class timing_sram_test(openram_test):
         c = sram_config(word_size=1,
                         num_words=16,
                         num_banks=1)
-
+        c.words_per_row=1
         debug.info(1, "Testing timing for sample 1bit, 16words SRAM with 1 bank")
         s = sram(c, name="sram1")
 
diff --git a/compiler/tests/21_ngspice_delay_test.py b/compiler/tests/21_ngspice_delay_test.py
index 02557d96..d54cdf54 100755
--- a/compiler/tests/21_ngspice_delay_test.py
+++ b/compiler/tests/21_ngspice_delay_test.py
@@ -32,7 +32,7 @@ class timing_sram_test(openram_test):
         c = sram_config(word_size=1,
                         num_words=16,
                         num_banks=1)
-
+        c.words_per_row=1
         debug.info(1, "Testing timing for sample 1bit, 16words SRAM with 1 bank")
         s = sram(c, name="sram1")
 
diff --git a/compiler/tests/23_lib_sram_model_test.py b/compiler/tests/23_lib_sram_model_test.py
index cec8b85a..8d5064d5 100755
--- a/compiler/tests/23_lib_sram_model_test.py
+++ b/compiler/tests/23_lib_sram_model_test.py
@@ -22,10 +22,9 @@ class lib_test(openram_test):
         c = sram_config(word_size=2,
                         num_words=16,
                         num_banks=1)
-
+        c.words_per_row=1
         debug.info(1, "Testing analytical timing for sample 2 bit, 16 words SRAM with 1 bank")
         s = sram(c, "sram_2_16_1_{0}".format(OPTS.tech_name))
-
         tempspice = OPTS.openram_temp + "temp.sp"
         s.sp_write(tempspice)
 
diff --git a/compiler/tests/23_lib_sram_prune_test.py b/compiler/tests/23_lib_sram_prune_test.py
index 37974bf7..952072aa 100755
--- a/compiler/tests/23_lib_sram_prune_test.py
+++ b/compiler/tests/23_lib_sram_prune_test.py
@@ -31,7 +31,7 @@ class lib_test(openram_test):
         c = sram_config(word_size=2,
                         num_words=16,
                         num_banks=1)
-
+        c.words_per_row=1
         debug.info(1, "Testing pruned timing for sample 2 bit, 16 words SRAM with 1 bank")
         s = sram(c, "sram_2_16_1_{0}".format(OPTS.tech_name))
 
diff --git a/compiler/tests/23_lib_sram_test.py b/compiler/tests/23_lib_sram_test.py
index 5e6aa060..1b2d317c 100755
--- a/compiler/tests/23_lib_sram_test.py
+++ b/compiler/tests/23_lib_sram_test.py
@@ -31,7 +31,7 @@ class lib_test(openram_test):
         c = sram_config(word_size=2,
                         num_words=16,
                         num_banks=1)
-
+        c.words_per_row=1
         debug.info(1, "Testing timing for sample 2 bit, 16 words SRAM with 1 bank")
         s = sram(c, "sram_2_16_1_{0}".format(OPTS.tech_name))
 
diff --git a/compiler/tests/24_lef_sram_test.py b/compiler/tests/24_lef_sram_test.py
index b2566b84..f66104b6 100755
--- a/compiler/tests/24_lef_sram_test.py
+++ b/compiler/tests/24_lef_sram_test.py
@@ -22,7 +22,7 @@ class lef_test(openram_test):
         c = sram_config(word_size=2,
                         num_words=16,
                         num_banks=1)
-
+        c.words_per_row=1
         debug.info(1, "Testing LEF for sample 2 bit, 16 words SRAM with 1 bank")
         s = sram(c, "sram_2_16_1_{0}".format(OPTS.tech_name))
 
diff --git a/compiler/tests/25_verilog_sram_test.py b/compiler/tests/25_verilog_sram_test.py
index 9412e8e8..48ba29e8 100755
--- a/compiler/tests/25_verilog_sram_test.py
+++ b/compiler/tests/25_verilog_sram_test.py
@@ -21,7 +21,7 @@ class verilog_test(openram_test):
         c = sram_config(word_size=2,
                         num_words=16,
                         num_banks=1)
-
+        c.words_per_row=1
         debug.info(1, "Testing Verilog for sample 2 bit, 16 words SRAM with 1 bank")
         s = sram(c, "sram_2_16_1_{0}".format(OPTS.tech_name))