improve_test_coverage: re-enabled and fixed disabled test
improved_test_coverage: improving test coverage slightly
Merge remote-tracking branch 'origin/improve_test_coverage'