handling more edge cases, unified list creation on all cases
cleaning up
enabling test back