testData: Add some empty slots
Fix some bugs found in testing