Moar testing fixes