Fixing majority of the tests. Only the fixer one fails now