Fixing tests and removing brackets completly