Tests for recent refactoring