Write tests for stalled and failing cases
Almost done