Initial revision - first tests.