Finish splitting up that compile and run phase
Fix deps for tests