More test, updated solution files