Not needed
Improved code coverage on tests
simplify tests