Complete with fixed tests