broke test up into new class
logic fix
check for None first