Update tests and finish top/bottom row