Adding a full suite of tests