Changed some of the fx/stop tests to handle the new test markup.