split tests with an AND + fix some errors
Merge pull request #144 from alain91/master

split tests with an AND + fix some errors