More clean up - jobs getting faster
simple tests