Finished adding network dbID support and updated tests