fix import thinko
disable aggregation type for all data
fix underscores in longopt
fix handler invocation
fix import
start to remove abuse of return types in test lookups
remove uncalled branch