Track run configuration, new empty entry point, fix unit tests