Made Some Tests

And everything works properly now! Again!