FRAFDBCK-9927 test completed ready for review.

Cleaned up issues from first code review. Finished writing test