Started SLR cleanup and added tests for the forwarder