#10 removing test code - no more manual-trigger exception