Cleaned up tests + FRC methods implemented including tests