Switched to faker for more reliable tests