adjusted behaviour and silenced test output