Moved test files to their own source folder.  Made changes to
MiddleManThread so tests now pass.