Merge pull request #6 from eucalyptus/tests-refactored

Merge pull request #895 from aliceh/upstream-merge
Renamed KOALA directory
Merge pull request #897 from aliceh/upstream-merge

Renamed KOALA directory.