increase test-coverage, improve tests