Cleaned up the finite state machine tests.