Renaming validOption() to validQueryParam()
Adding todo comments for remaining tests