Add Bower tests
Unify logical operators