TimeAngleUtils logic + tests
cleanup