Add tests and fixes to check-below