making tests compatible