Tests updated and job queue test added

Main code rev. 1912