Argument handling + new tests uploaded