rearanged tests
docker revive!