unit testing fix and rt strategy minor cleanup