Moved + cleanup
Some dep cleanups and first test fixes