Revisited failing tests. Removed '@Ignore's. Changed bean declerations
and uncommented previously failing flow.