Updated tests & bfs