Add some more tests
Fix the mode spec
Add friendlyid and a ship list to the line