first tests
fix condition
added tests