NEW Added additional unit tests FIX Fixed issues that made new tests fail.