Change request and separate tests