6 - Fixing tests and making sure Nils was here