Unit test improvements.

Performance tests fixed. The method isn't called 10 times, only the closure is.