Fixup tests

- Move packages
- Remove superfluous BeforeAndAfter