Fixed bracket error
Started readjusting tests