Moved to package optimisation
Added test input data