Modify to include testing of new methods.