Put exceptions folder back in
Fixed this one
Progressing this test
Reordering deps