Logical && and || -- tests and bugfix