Fix and test for adding null tracks