Add tests and improve for HotNewHipHop