Fix units tests