first tests and fixes