Fixed typo
Fixed multiple compile-errors
Removed unused dependencies, modified AvatarTest