Done with "Find Bugs", fixed the white box tests