Better tests
Remove performance stuff.