Changes class names, fixes divide by 0 on tests