unit tests green again

fix last issues