Additional Unit Tests (post SteveF meeting).