Updated the unit test to cover fragmetns and queries