#26: Extended tests model, improved handling of invalid requests