Issue #1: Add test infrastructure in a more robust way.