Adds better tests that are r2-full compatible