events unit tests
cleaned up swap files