More infinite loops

Still fixing infinite loop issues. Now just getting tests to be set up
correctly, for the most part.