Two more methods are now, at least rudimentarily, tested

Change-Id: I89d0c423b455d4b3eeb4e23a3afb6bd25837c59a