Fixed incorrect status output when using cell mode
Updated tests to work with new output