Dependency updates
Increased mocha timeout
Improved metrics update
Reorganized test data in a single file