Fix tests
Split ec2 config
Fix cap file