Main() test, few fixes though all the files