Started to redo the tests

Signed-off-by: Stephen Cox <stephencoxmail@gmail.com>