Updating tests to remove redundant integration test and improve coverage of unit test

Signed-off-by: Dan Rumney <dancrumb@gmail.com>