Two new test classes and some changes to methods and existing classes plus bug fixes