Vishal #0 Renamed classes and added more tests for big query