Added Test runner and few cleanups.