refactored tests
improved tests