changed one condition to let the tests pass, splited one test in two

and used more specifc annotations