reverted back to ms and fixed file reading
Rearranges tests; switches to normal queue; fixes memory leak