Lot of adjustements
Added test infrastructure