Fixing bugs on the test :)