Fixed gateways path, passed on vanilla setup
Solved some tests that weren't passing
Fixed several tests