Clean up + extra runner unit tests.
Added entry point.