allow compilation of tests, fix up more network forms, remove planet stuff