Added Jobs test. Some small naming fixes in other tests