Add base infrastructure for testing