Style tweaks
Add factory specs
Fix text factory