Fixes: #36
Fixed some minor issues with etags
Fixed failing tests