checking for memory leaks, performance, cleanup on testing, etc.

checking for memory leaks, performance, cleanup on testing, etc. #182