Fixed door tests.
Resolved merge conflicts