Added commandline arguments and first tests