Unit tests for rerun
along w/ fixes to make them work
LMS-11011