Remove RH support, add tests