Add Initial Fb testing support, Port to 3.0