Adding FPSession and some tests