Making tests compatible to R15 releases