Tests reorganisation and regression test for expandInteger function
Note about regression test
Minor fixes