Implement test and benchmark
Update test