Wee refactor
Add message factory specs