Back to green tests
cleaning up names
ongoing refactorings