Add test baseline
Slightly more general angle handling.