Tests and fb fix
Merge branch 'test'