Fix tests
Remove redundant broken tests and renamed all Builder related stuff to Analyer