Improve docs, tidy up aws tests.