implemented #2

- added automatic detection amazon.properties
- revised tests