Fixing paths
API and Events tests
A bit more spacing for readability