Non Queue test mainly complete

Worked on all tests not involving the queue. Will need to be checked and
cleaned