Changed test cases to use shorter syntax