Removing test infra code & making it a separate dev dependency