Updating the tests and refactoring the code a little

There was an error in the goamz package the prevented updating the
availability zones correctly. So PR #181 should be merged before this
one can be merged…
Merge pull request #682 from svanharmelen/f-provider/aws-fix-tests

provider/aws: updating the tests and refactoring the code a little