Made some of the tests expression statements instead of declarations