Removed some tests
Corrected events
Created Swap event