improved tests
improved coverage