Refined test statements, started to code for checkRow