New tests

Make avocado a little more robust, put some symmetry in the execution of test methods, and add 3 functional tests of avocado.