Clean up factories
Update Payment spec