Further checks & tests