Fixed tests and multiple improvements in first time job entry.