Added flow definition classes
Added missing test classes
Renamed to something more meaningful