Tidy up some tests

- Add @group SystemTest
- Resolve some styling issues