added more tests and did checks for RF SF and FOAK