Changing the building order of the flows module. Removing unnecessary annotation from tests.