cleanup and test on more rubies

@zbrock @rudle @JackDanger