3 Levels, More robust, Test Fixes