Adding border image test cases and cleaning up a few background cases