FSM classes
Tests for FSM classes. Fixes and namespace changes