Updated tests; better handling of skippable data