Version supposed to be read from file + test + some fixes