Cleanup imports
Added all parameters to self link
Updated validation of query params
SImplified tests