Tests: reorganization, higher coverage