Now properly tests the right class (fixes #3553754)

Change-Id: Id1a43219832241e57cab46c40941564f8b978187
Correct boolean comparison

Change-Id: I0a4f1eb2e97403089d046e5ab2dad22676c98256
Signed-off-by: John May <john.wilkinsonmay@gmail.com>
Be absolutely sure we compare ints

Change-Id: I2bf575ccd169ab1ce24b15f7a1e1f2a0dadd9b6d
Signed-off-by: John May <john.wilkinsonmay@gmail.com>