Query parameters in request make api query
Removed Test directory - not used
Updated templates etc