Cleaned up test names and fixed bug in EtlJob