More small fixes to jobs, I've begun work on a test for artifacts however I know this class is very wrong atm.