Fix failing tests

 * Change file name of data-source ns to data_source
 * Fix import of java.net inetaddress