better tests with improved coverage