Add a file for Phase 2 Part 1 and some minor other tests