Simplified testing, added message factory.