modular: minor test refactoring. always stub toaster. added simple matcher.