Move to throwing errors. Tests are momentarily broken