New levels, re-structuring for testing