Passing tests, added FB test, remove deprecated API test