Moar testing and refractoring