Added filtering of null valued query strings
Removed outdated test