Added more tests and performance tests