Small refactor and passing basic register Initialization tests