Add quotes where appropriate.
Use double bracket for tests.