Updated FSM to reflect principles of universality, and added test data
for both datasets we want to test versus.