clean up tests
various modifications
fix JobNotExistsException
Various clean up