Completed tests

Signed-off-by: Fox