Add some more sample checks