Add Expected support to PutAttributes
Factor out functions to determine attributes and such from query params
Remove superfluous tests