Cleaning up the FLR behavior
Adding tests for the FLR behavior