Fixed tests for R15