merge mvp branch
added fb tests