Additional tweeks.
Added an empty test case

Signed-off-by: JC <jay@spruceboy.net>