move ElastiCache stuff around, package-wise
split unit and integration tests so they run in different phases