Fixed closure, remove test file.

Ready for merge.