Fixes IEnumerable checks and reorganises tests