ADDED: Tests for complex construction, debugging