New basic structure and tests