added missing method; reworked tests