Adding performance tests and logging