Improves testing, commandline interfaces