More tests implemented, Altered some Queries