More re-organization. Missing tests