Made all selenium tests pass