Fixed logging
Fixed test153