#1257 finished up EBI forwarded user code and test for functionality