Started fixing unittests on command line...