Removed injections; fixed tests