Cleaned up UserModelExtensionsTests a bit