Refactor test suite for new architecture

Take the opportunity to also narrow test scope.