Tests now run correctly, and fixed a flow control issue