Added test coverage to JobClass

* Also changed some methods logic for better UnitTesting