Fixing tests

Signed-off-by: Eric Johnson <edj.boston@gmail.com>
Refactoring Test class

Signed-off-by: Eric Johnson <edj.boston@gmail.com>