first tests working, reordered