Fixed some stuff. Tests still broken