now with moar tests! 14% more to be specific